Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update XAML completion kind mapping to new 16.10 CompletionItemKinds. #52166

Merged
1 commit merged into from
Mar 26, 2021

Conversation

mgoertz-msft
Copy link
Contributor

No description provided.

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approval

@ghost ghost merged commit 7d46783 into dotnet:main Mar 26, 2021
@ghost ghost added this to the Next milestone Mar 26, 2021
@CyrusNajmabadi
Copy link
Member

@mgoertz-msft Who approved this?

@mgoertz-msft
Copy link
Contributor Author

@CyrusNajmabadi Great question, I was surprised as well. Looks like the msftbot auto-approved this. Would be worth checking the msftbot'srules and capabilities.

@CyrusNajmabadi
Copy link
Member

@jaredpar @jinujoseph @jasonmalinowski msft-bot just merged this pr without approval from any team members. This seems... Not good.

@CyrusNajmabadi
Copy link
Member

thanks marco! :-)

@CyrusNajmabadi
Copy link
Member

This pr looks fine to me. So no need to roll back. But we likely need to put a hold on auto-merge until this is understood.

@333fred
Copy link
Member

333fred commented Mar 26, 2021

This is exactly what the bot was designed to do, as it automates the merge PRs between branches.

@jinujoseph
Copy link
Contributor

@JoeRobich @333fred @allisonchou to take a look

@333fred
Copy link
Member

333fred commented Mar 26, 2021

To be clear: this is how the auto-merge bot has been functioning for at least a year now? Do not put auto-merge on PRs that you are not ready to be auto-merged.

@JoeRobich
Copy link
Member

auto-approval is granted to anyone who has write or admin access. we could limit auto-approval to dotnet-bot.

@CyrusNajmabadi
Copy link
Member

This has never happened before. The bot would always say: i need at least a signoff on a PR. Or, it would say: you have someone still requesting a change.

Do not put auto-merge on PRs that you are not ready to be auto-merged.

Wat?

Shouldn't it only merge PRs that have been signed off on?

@333fred
Copy link
Member

333fred commented Mar 27, 2021

Shouldn't it only merge PRs that have been signed off on?

No. The bot was designed for the branch codeflow process. Bot 1 makes a pr to merge from branch a to b, and adds this label. Bot 2 adds auto approves, then merges (assuming tests pass). That's how it was supposed to function.

@davidwengier
Copy link
Member

This has never happened before.

This is how the bot has always worked since I joined, and one of the reasons I don't like it, because I can't use the label on a small PR on a Friday, I instead have to monitor for a human approval on the weekend, then I can label it.

The new auto-merge functionality in GitHub should work a lot better in this regard.

@allisonchou allisonchou modified the milestones: Next, 16.10.P2 Mar 29, 2021
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants